Issue #95 fix