Convert #418393 to Flügger