Convert #469357 to Flügger