Adding the zero check