Convert #329909 to Flügger