Fixed an issues when moving from one sensor to another