Reverted bug in driver