Allow for zero, again