Attempt at fixing location issue.