hotfix, close #321