MEDIUM / Attempt to fix serialization issue