Fixed bug of syncing everytime