Fix for Issue #2

Fixes issue #2.