fixed optimization in driver