Issue #45 fix