Convert #517828 to Flügger