Fix issue with 0s