Fix for Issue #2. Require testing before closing issue.