Convert #348399 to Flügger