Fix --location as per #1