Convert #351676 to Flügger