Convert #517682 to Flügger