Handle correctly the overflow