Convert #342287 to Flügger