Fix sync issue