Zero fix

For issue #59