Close #1223