Convert #517347 to Flügger