Fix and close #28