Attempt to fix deserialization issue