Current working dir fix