race issue handling