same changes than before, really working now, only with a correct dir
name