Fix #1610

Fix #1610