Convert #329583 to Flügger