Convert #623659 to Flügger