Convert #528485 to Flügger