Fix location parsing