fixed serialization concurrency issue!