Another attempt to close #139