Convert #521951 to Flügger