Fix and close #52