Convert #228424 to Flügger