Convert #228946 to Flügger