Scopes updates

Vote fix without the bug