Convert #236340 to Flügger