hotfix, close #319