Fix memory issue in solvate