Convert #617436 to Flügger