Finally fix #7