Issue #36 fix