fixed some cocurrency issue