Issue #114 fix