fixed the solution bug partially
all done