Convert #348595 to Flügger