partial fix in vip serialization