Convert #517087 to Flügger