Convert #436697 to Flügger