Patch to handle serialization of nested 'normal' classes