Fixing access
Changed access control to take bundle into account