Convert #379359 to Flügger