Fixed bug where switching servers causes assert failure.