fixed location resolving issue