Fix location header issue