Close #1024