Convert #329907 to Flügger