Issue #32: bug fix