Fixed syncronization problems