Fix and close #1