Access key bug fix