Convert #348376 to Flügger