resolve server state issue