Partially fix #7.