fixed race conditions in CAD
minor
mergefix