Convert #348486 to Flügger