Convert #436779 to Flügger