Issue #33 fix.