fixed: race and conflict