Fix to location controller (pipeline changes)