Convert #617209 to Flügger