Issue #40 fix.

Fixes Issue #40