fix location lookup