Convert #521939 to Flügger