fixed up automatic sync