Fixed issues caused by syncing