Convert #517376 to Flügger