fix current solutions bugs