Close #1682