Stage SensorHandler fix