Fix for error during deserialization