diff --git a/struct.c b/struct.c
index 1de9bbe..fc03130 100644
--- a/struct.c
+++ b/struct.c
@@ -207,15 +207,13 @@ make_struct(VALUE name, VALUE members, VALUE klass)
     len = RARRAY_LEN(members);
     for (i=0; i< len; i++) {
 	ID id = SYM2ID(ptr_members[i]);
-	if (rb_is_local_id(id) || rb_is_const_id(id)) {
-	    if (i < N_REF_FUNC) {
-		rb_define_method_id(nstr, id, ref_func[i], 0);
-	    }
-	    else {
-		rb_define_method_id(nstr, id, rb_struct_ref, 0);
-	    }
-	    rb_define_method_id(nstr, rb_id_attrset(id), rb_struct_set, 1);
+	if (i < N_REF_FUNC) {
+	    rb_define_method_id(nstr, id, ref_func[i], 0);
+	}
+	else {
+	    rb_define_method_id(nstr, id, rb_struct_ref, 0);
 	}
+	rb_define_method_id(nstr, rb_id_attrset(id), rb_struct_set, 1);
     }
 
     return nstr;
diff --git a/test/ruby/test_struct.rb b/test/ruby/test_struct.rb
index 03cb559..1c10877 100644
--- a/test/ruby/test_struct.rb
+++ b/test/ruby/test_struct.rb
@@ -227,6 +227,13 @@ class TestStruct < Test::Unit::TestCase
     assert_equal("#<struct Struct::R\u{e9}sum\u{e9} r\u{e9}sum\u{e9}=42>", a.inspect, '[ruby-core:24849]')
   end
 
+  def test_junk
+    struct_test = Struct.new("Foo", "a\000")
+    o = struct_test.new(1)
+    assert_equal(1, o.send("a\000"))
+    Struct.instance_eval { remove_const(:Foo) }
+  end
+
   def test_comparison_when_recursive
     klass1 = Struct.new(:a, :b, :c)