Fixed to allow serialized attributes to be marshalled