Convert #623225 to Flügger