I think I fixed #7