Fixed no location bug