fixed problem with wrong locations.