Fix for Issue #2006