Fix for latest running cwd code.