Fix and close #149