Fix for sandboxes when baseURL is set