Fix actuator conflict