tentative fix for the serialization issue