Convert #517177 to Flügger