Fixing Deserialization