Convert #623291 to Flügger