Fix and close #138 and #140