partially fix #42