Convert #624930 to Flügger