Resolve #27: Fix --with-workdir switch in CPT