Issue #72 fix