Convert #617489 to Flügger