fix location problem