Partially fix #103