Changes for access level bug fix.