fixed solver... again