Convert #228669 to Flügger