CFY-1105 fix cwd