Update #467 based on feedback

Closes #467
How do I do that? Check for `0`?