Bugfix 11559

Further updates to this bugfix so that it is actually fixed in 6.5.1 (rather than against 6.5!)