Fix and close #14