Fixed small issue with scopes