Convert #348929 to Flügger