diff --git a/src/org/linphone/core/LinphoneCallImpl.java b/src/org/linphone/core/LinphoneCallImpl.java
index 3f153e0fc..6370dce17 100644
--- a/src/org/linphone/core/LinphoneCallImpl.java
+++ b/src/org/linphone/core/LinphoneCallImpl.java
@@ -46,7 +46,7 @@ class LinphoneCallImpl implements LinphoneCall {
 	/*
 	 * This method must always be called from JNI, nothing else.
 	 */
-	protected LinphoneCallImpl(long aNativePtr)  {
+	private LinphoneCallImpl(long aNativePtr)  {
 		nativePtr = aNativePtr;
 	}
 	protected void finalize() throws Throwable {
diff --git a/src/org/linphone/core/LinphoneCoreImpl.java b/src/org/linphone/core/LinphoneCoreImpl.java
index 0f91922d7..bf5e5de9c 100644
--- a/src/org/linphone/core/LinphoneCoreImpl.java
+++ b/src/org/linphone/core/LinphoneCoreImpl.java
@@ -560,10 +560,9 @@ class LinphoneCoreImpl implements LinphoneCore {
 		transferCallToAnother(nativePtr, getCallPtr(call), getCallPtr(dest));
 	}
 
-	private native long findCallFromUri(long nativePtr, String uri);
+	private native Object findCallFromUri(long nativePtr, String uri);
 	@Override
 	public synchronized LinphoneCall findCallFromUri(String uri) {
-		long callPtr = findCallFromUri(nativePtr, uri);
-		return callPtr != 0 ? new LinphoneCallImpl(callPtr) : null;
+		return (LinphoneCall) findCallFromUri(nativePtr, uri);
 	}
 }