Fixed synch issues