Partially fix #57