Working dir bug fixed