Convert #518387 to Flügger