Bug fix when syncing existing units