Convert #517054 to Flügger