Partially fix #6