Convert #517679 to Flügger