Convert #228576 to Flügger