Convert #228654 to Flügger