Convert #348372 to Flügger