Fix previous commit and close #43