Close #1046