correction bug 1/2
correction bug 2/2