Convert #379745 to Flügger