Fix issue with global fallback when not in global space
Fix issue with global fallback not in global space