added a workaround to by pass multi workspace limitation