Fixed location bug