Convert #517357 to Flügger