Convert #521845 to Flügger