fix issue: #86