Convert #623306 to Flügger