Issue #30 fix