Second part of fix for #6154, ensure we return max access