Close #980