Convert #507889 to Flügger