Fixed issues synchronisation issue