Different fix for MRU and cwd bug