Close #1619