some bugs fixed when synchronization is not fully complete