fixed math issue between 2.x and 3.x