Convert #228328 to Flügger