Fixing access control issue