Fixing key scope issue.