DESIGNDOC + fixed race