Fix and close #8