Fix to make auto transition to enabled/drive work properly