Removed bugs associated with small numbers of points