Fix problem with CWD