Issue #131 - fix bug