Fixing old cluster/sector confusion