Resolve (hopefully) the trailing slash issue