Fix solve