Convert #228246 to Flügger