Partially fix #19