Deal with cd stubs