Convert #647828 to Flügger