Minor change to location implementation