Goal location bug fix