THis really fixes the serialization issues