Convert #379461 to Flügger