Convert #348183 to Flügger