Added extra check on number of points