Attemted to fix infinite solutions