Convert #329771 to Flügger