Fixed bugs with zeroes