Fixed villager behavior