Making location more robust.