fix some sync issue