EDIT ::: correction bug