fix issue: #403 and #424