Convert #517317 to Flügger