Partial Fix for Issue #168.