Convert #516285 to Flügger