Convert #436837 to Flügger