Fixed syncronization issue