Convert #228945 to Flügger