Added a zero check