Bug Fix: Remove cwd() changes