Convert #348384 to Flügger