[#47] Fixed scopes