Fixed issues with 0's