fixing location bug