Close #1818