fixed bug with insynchronization
merged
merged