Convert #379376 to Flügger