Fix close directly in driver