Convert #617897 to Flügger