Fix #1615

Fix it.