Convert #623490 to Flügger