fixes of solution