Fixing bug with localtion