Fixed bugs related to zero point