Fix gmx solvate topology updating