Issue #76 fix