Convert #396387 to Flügger