BUG Fixed issue with alternate BaseURL