Convert #623671 to Flügger