now fixed checking for 0 properly