diff --git a/src/main/java/cactusServer/entities/Character.java b/src/main/java/cactusServer/entities/Character.java
index d45e75b..c8eb53f 100644
--- a/src/main/java/cactusServer/entities/Character.java
+++ b/src/main/java/cactusServer/entities/Character.java
@@ -68,8 +68,8 @@
 	}
 
 	@JSONHint(ignore = true)
-	public List<Item> getItems() {
-		return new ArrayList<Item>(itemMap.values());
+	public HashMap<String, Item> getItems() {
+		return itemMap;
 	}
 
 	public void setAccountURI(String accountURI) {
@@ -131,7 +131,7 @@
 
 	private String findAreaURI(Instance instance) {
 		// �L�����N�^�[�̃|�W�V������p���Ăǂ̃G���A���ɂ��邩�𔻒肵�ē��Y�G���A��URI�ɍX�V����
-		for (String areaId : instance.getAreaIdSet()) {
+		for (String areaId : instance.getAreas().keySet()) {
 			Area area = instance.getArea(areaId);
 			if (area.isSurroundingPosition(position)) {
 				int subStringEndIndex = areaURI.length() - Area.UNIQUE_ID_LENGTH;