Fixing issue #181.

This resolves Issue #181.