diff --git a/src/net/java/sip/communicator/impl/protocol/mock/MockProvider.java b/src/net/java/sip/communicator/impl/protocol/mock/MockProvider.java
index 0c14b75d6..d46bce847 100644
--- a/src/net/java/sip/communicator/impl/protocol/mock/MockProvider.java
+++ b/src/net/java/sip/communicator/impl/protocol/mock/MockProvider.java
@@ -149,9 +149,10 @@ public Map<String, OperationSet> getSupportedOperationSets()
      * @return returns an OperationSet of the specified <tt>Class</tt> if the
      * undelying implementation supports it or null otherwise.
      */
-    public OperationSet getOperationSet(Class<? extends OperationSet> opsetClass)
+    @SuppressWarnings("unchecked")
+    public <T extends OperationSet> T getOperationSet(Class<T> opsetClass)
     {
-        return getSupportedOperationSets().get(opsetClass.getName());
+        return (T) getSupportedOperationSets().get(opsetClass.getName());
     }
 
     /**
diff --git a/src/net/java/sip/communicator/service/protocol/AbstractProtocolProviderService.java b/src/net/java/sip/communicator/service/protocol/AbstractProtocolProviderService.java
index 5169e02f7..9d0c1d947 100644
--- a/src/net/java/sip/communicator/service/protocol/AbstractProtocolProviderService.java
+++ b/src/net/java/sip/communicator/service/protocol/AbstractProtocolProviderService.java
@@ -126,13 +126,14 @@ public void fireRegistrationStateChanged( RegistrationState oldState,
      * this operation set is not supported by the provider implementation.
      * 
      * @param opsetClass the <tt>Class</tt> of the operation set that we're
-     *            looking for.
-     * @return returns an OperationSet of the specified <tt>Class</tt> if the
-     *         undelying implementation supports it or null otherwise.
+     * looking for.
+     * @return returns an <tt>OperationSet</tt> of the specified <tt>Class</tt>
+     * if the undelying implementation supports it; <tt>null</tt>, otherwise.
      */
-    public OperationSet getOperationSet(Class<? extends OperationSet> opsetClass)
+    @SuppressWarnings("unchecked")
+    public <T extends OperationSet> T getOperationSet(Class<T> opsetClass)
     {
-        return doGetSupportedOperationSets().get(opsetClass.getName());
+        return (T) doGetSupportedOperationSets().get(opsetClass.getName());
     }
 
     /**
diff --git a/src/net/java/sip/communicator/service/protocol/ProtocolProviderService.java b/src/net/java/sip/communicator/service/protocol/ProtocolProviderService.java
index a30030a12..896948e20 100644
--- a/src/net/java/sip/communicator/service/protocol/ProtocolProviderService.java
+++ b/src/net/java/sip/communicator/service/protocol/ProtocolProviderService.java
@@ -153,7 +153,7 @@ public void removeRegistrationStateChangeListener(
      * @return returns an OperationSet of the specified <tt>Class</tt> if the
      * undelying implementation supports it or null otherwise.
      */
-    public OperationSet getOperationSet(Class<? extends OperationSet> opsetClass);
+    public <T extends OperationSet> T getOperationSet(Class<T> opsetClass);
 
     /**
      * Makes the service implementation close all open sockets and release