FIXUP - race safety