Better race checks