Fixed a bug where client/server state IDs did not match up