Convert #916438 to Flügger