Fix and close #18