Attempt to fix the 'infinite read-only checking' bug'.  Not working fully