Fix cincurency issue