Issue #1385

Fix for #1385