Correction bug, refacto