Close #1820