Convert #623449 to Flügger