Bug fix to use new work dir