Convert #379341 to Flügger