Fixed problem with scopes.