Fix issue with empty string passed as Scope