Convert #517286 to Flügger