Issue #95 code fix