Properly handle zero