diff --git a/src/com/opera/core/systems/OperaWebElement.java b/src/com/opera/core/systems/OperaWebElement.java
index <HASH>..<HASH> 100644
--- a/src/com/opera/core/systems/OperaWebElement.java
+++ b/src/com/opera/core/systems/OperaWebElement.java
@@ -114,6 +114,7 @@ public class OperaWebElement extends RemoteWebElement {
     return debugger.callFunctionOnObject(script, objectId, true);
   }
 
+  // TODO(andreastt): OPDRV-199
   public void click() {
     assertElementNotStale();
     assertElementDisplayed();
diff --git a/test/com/opera/core/systems/pages/WindowPage.java b/test/com/opera/core/systems/pages/WindowPage.java
index <HASH>..<HASH> 100644
--- a/test/com/opera/core/systems/pages/WindowPage.java
+++ b/test/com/opera/core/systems/pages/WindowPage.java
@@ -71,6 +71,7 @@ public class WindowPage extends Page {
     String currentWindow = driver.getWindowHandle();
 
     // Trigger new window load and wait for window to open
+    // TODO: OPDRV-199
     windowLink.click();
     try {
       Thread.sleep(100);
Adding a note about OPDRV-<I>