diff --git a/ChangeLog b/ChangeLog
index c63b766dc..e892bf010 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-13  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+	* glib/ValueArray.cs: use type specific PtrToStructure marshaling to
+	avoid ArgumentExceptions.  [Fixes #503467]
+
 2009-05-13  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 
 	* glib/Value.cs: Add support for ValueArrays inside GLib.Values.
diff --git a/glib/ValueArray.cs b/glib/ValueArray.cs
index e8ae9b8b3..357397061 100644
--- a/glib/ValueArray.cs
+++ b/glib/ValueArray.cs
@@ -157,9 +157,8 @@ namespace GLib {
 
 		public object this [int index] { 
 			get { 
-				GLib.Value val = Value.Empty;
-				Marshal.PtrToStructure (g_value_array_get_nth (Handle, (uint) index), val);
-				return val;
+				IntPtr raw_val = g_value_array_get_nth (Handle, (uint) index);
+				return Marshal.PtrToStructure (raw_val, typeof (GLib.Value));
 			}
 		}