Correctly resolving location