Fix and close #4