Fixed bug, with location header