fix current solution bug