Custom race deserialisation fix