Fix last workspace issue while changing CWD