Convert #617435 to Flügger