Fix and close #19.