Fix for Issue #1

Fixes issue #1.