Fixing issue with multi-region