partially fix #158