Issue #40 fix.