Finally fixed location bug.