diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/MonitorInfoImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/MonitorInfoImpl.java
index 3df6ef5..3e72c0c 100644
--- a/agent/src/share/classes/sun/jvm/hotspot/jdi/MonitorInfoImpl.java
+++ b/agent/src/share/classes/sun/jvm/hotspot/jdi/MonitorInfoImpl.java
@@ -26,10 +26,7 @@
 
 import com.sun.jdi.*;
 
-// FIXME: This class should implement com.sun.jdi.MonitorInfo.
-//        So fix this when hotspot is started to build with
-//        jdk1.6.
-public class MonitorInfoImpl extends MirrorImpl {
+public class MonitorInfoImpl extends MirrorImpl implements MonitorInfo {
 
     /* Once false, monitorInfo should not be used.
      * access synchronized on (vm.state())