Fix for location - tx jarjar123