Convert #623942 to Flügger