COSMITS + FIX serialization bug