Convert #248328 to Flügger