Trying to fix access control