Convert #228239 to Flügger