Serilization fix