Fixing a serialization error