Convert #617428 to Flügger