Issue #19: bug fix