Convert #542525 to Flügger