Convert #228668 to Flügger