Convert #517642 to Flügger