Close #945