Convert #623241 to Flügger