fix issue: #22