Convert #418930 to Flügger