Merge "Fix is_zero check"