Convert #228658 to Flügger