Cahse one more spot for handling work_dir