Convert #329670 to Flügger