Convert #348559 to Flügger