Close #1794