Fix issues with 0