Bug fix for Issue #88

This commit fixes issue #88 which was introduced by Commit b43dad00b.

See issue #88 for discussion.