Fix syncrony issue