Still fixing solve bug