diff --git a/tools/cooja/java/se/sics/cooja/MoteInterfaceHandler.java b/tools/cooja/java/se/sics/cooja/MoteInterfaceHandler.java
index a146f7fe1..34ab35327 100644
--- a/tools/cooja/java/se/sics/cooja/MoteInterfaceHandler.java
+++ b/tools/cooja/java/se/sics/cooja/MoteInterfaceHandler.java
@@ -105,8 +105,8 @@ public class MoteInterfaceHandler {
    */
   public <N extends MoteInterface> N getInterfaceOfType(Class<N> interfaceType) {
     for (MoteInterface intf : moteInterfaces) {
-      if (interfaceType.isAssignableFrom(intf.getClass())) {
-        return (N) intf;
+      if (interfaceType.isInstance(intf)) {
+        return interfaceType.cast(intf);
       }
     }