diff --git a/lib/exw3.ex b/lib/exw3.ex
index 6847d6b..4e8b622 100644
--- a/lib/exw3.ex
+++ b/lib/exw3.ex
@@ -518,6 +518,16 @@ defmodule ExW3 do
       Enum.join([name, "(", Enum.join(non_indexed_types, ","), ")"])      
     end
 
+    defp topics_helper(fields) do
+      if length(fields) > 0 do
+	types = Enum.map(fields, fn field ->
+	  "(#{field["type"]})"
+	end)	
+      else
+	[]
+      end      
+    end
+
     defp init_events(abi) do
       events =
         Enum.filter(abi, fn {_, v} ->
@@ -526,8 +536,7 @@ defmodule ExW3 do
 
       names_and_signature_types_map =
         Enum.map(events, fn {name, v} ->
-          types = Enum.map(v["inputs"], &Map.get(&1, "type"))
-          names = Enum.map(v["inputs"], &Map.get(&1, "name"))
+          types = Enum.map(v["inputs"], &Map.get(&1, "type"))          
           signature = Enum.join([name, "(", Enum.join(types, ","), ")"])
 
 	  encoded_event_signature = "0x#{ExW3.encode_event(signature)}"
@@ -540,9 +549,19 @@ defmodule ExW3 do
 	    !input["indexed"]
 	  end)
 
+	  non_indexed_names = Enum.map(non_indexed_fields, fn field ->
+	    field["name"]
+	  end)
+
 	  data_signature = data_signature_helper(name, non_indexed_fields)
 
-          {{encoded_event_signature, %{signature: data_signature, names: names}}, {name, encoded_event_signature}}
+	  event_attributes = %{
+	    signature: data_signature,
+	    non_indexed_names: non_indexed_names,
+	    topics: topics_helper(indexed_fields) 
+	    }
+
+          {{encoded_event_signature, event_attributes}, {name, encoded_event_signature}}
         end)
 
       signature_types_map =
@@ -669,7 +688,7 @@ defmodule ExW3 do
       payload = Map.merge(%{address: contract_info[:address], topics: [contract_info[:event_names][event_name]]}, event_data)
       filter_id = ExW3.new_filter(payload)
       event_signature = contract_info[:events][contract_info[:event_names][event_name]][:signature]
-      event_fields = contract_info[:events][contract_info[:event_names][event_name]][:names]
+      event_fields = contract_info[:events][contract_info[:event_names][event_name]][:non_indexed_names]
       EventListener.filter(filter_id, event_signature, event_fields, other_pid)
       {:reply, filter_id, Map.put(state, contract_name, contract_info ++ [event_name, filter_id])}
     end
@@ -733,7 +752,7 @@ defmodule ExW3 do
           event = Map.get(events, topic)
 
           if event do
-            Enum.zip(event[:names], ExW3.decode_event(log["data"], event[:signature]))
+            Enum.zip(event[:non_indexed_names], ExW3.decode_event(log["data"], event[:signature]))
             |> Enum.into(%{})
           else
             nil
diff --git a/test/exw3_test.exs b/test/exw3_test.exs
index 4ba0536..1d24558 100644
--- a/test/exw3_test.exs
+++ b/test/exw3_test.exs
@@ -159,11 +159,29 @@ defmodule EXW3Test do
 	    gas: 30_000
 			 })
 
-    {:ok, {receipt, logs}} = ExW3.Contract.tx_receipt(:EventTester, tx_hash2)
+    {:ok, {_receipt, logs}} = ExW3.Contract.tx_receipt(:EventTester, tx_hash2)
 
-    IO.inspect receipt
+    otherNum =
+      logs
+      |> Enum.at(0)
+      |> Map.get("otherNum")
 
-    
+    assert otherNum == 42
+
+    num =
+      logs
+      |> Enum.at(0)
+      |> Map.get("num")
+
+    assert num == 46
+
+    data =
+      logs
+      |> Enum.at(0)
+      |> Map.get("data")
+      |> ExW3.bytes_to_string
+
+    assert data == "Hello, World!"
   end
 
   test "starts a Contract GenServer and uses the event listener", context do