diff --git a/lib/gir_ffi/builder/type/object.rb b/lib/gir_ffi/builder/type/object.rb
index <HASH>..<HASH> 100644
--- a/lib/gir_ffi/builder/type/object.rb
+++ b/lib/gir_ffi/builder/type/object.rb
@@ -83,6 +83,7 @@ module GirFFI
           @klass.class_eval builder.setter_def
         end
 
+        # TODO: Guard agains accidental invocation of undefined vfuncs.
         def setup_vfunc_invokers
           info.vfuncs.each do |vfinfo|
             invoker = vfinfo.invoker
diff --git a/test/integration/generated_gimarshallingtests_test.rb b/test/integration/generated_gimarshallingtests_test.rb
index <HASH>..<HASH> 100644
--- a/test/integration/generated_gimarshallingtests_test.rb
+++ b/test/integration/generated_gimarshallingtests_test.rb
@@ -273,7 +273,6 @@ describe GIMarshallingTests do
       # NOTE: To call this method, the callback slot vfunc_with_callback has to
       # be filled in the GIMarshallingTests::Object class structure. The
       # GIMarshallingTests library doesn't do this.
-      # FIXME: Guard agains accidental invocation of undefined vfuncs.
       skip "Needs vfunc setup"
     end
Move a FIXME to a TODO in the right location