new fix for serialize