Current directory changing improvement