Fixing location again