Fix issues with zero values