Bigger max number of elements && Fix exception with -1.