Partial Fix for Issue #1