Fixed trailing slash issue