fix for Issue #1723