Fixed for dirs with spaces