closed #1619
closed #1610