Fix for Issue #200

Fixes Issue #200.