fix for Issue #1587