Avoid some incorrect behavior with gmx solvate