Added handling 0 for certain cases