Real bug fix addLocation