Close #946