fix after manual merge for Issue #1723