Adding support for zero as a parameter