Hopefully a fix for base url