Convert #348237 to Flügger