diff --git a/src/gas/javaupm_gas.i b/src/gas/javaupm_gas.i
index 5bdf457c..ef7b03b6 100644
--- a/src/gas/javaupm_gas.i
+++ b/src/gas/javaupm_gas.i
@@ -2,34 +2,48 @@
 %include "../upm.i"
 %include "typemaps.i"
 
-%apply uint16_t *OUTPUT {uint16_t *buffer };
-
-%include "gas.h"
 %{
     #include "gas.h"
-%}
-
-%include "mq2.h"
-%{
     #include "mq2.h"
-%}
-
-%include "mq3.h"
-%{
     #include "mq3.h"
-%}
-
-%include "mq5.h"
-%{
     #include "mq5.h"
-%}
-
-%include "mq9.h"
-%{
     #include "mq9.h"
-%}
-
-%include "tp401.h"
-%{
     #include "tp401.h"
 %}
+
+%typemap(jni) (uint16_t *buffer, unsigned int len) "jshortArray";
+%typemap(jtype) (uint16_t *buffer, unsigned int len) "short[]";
+%typemap(jstype) (uint16_t *buffer, unsigned int len) "short[]";
+
+%typemap(javain) (uint16_t *buffer, unsigned int len) "$javainput";
+
+%typemap(in) (uint16_t *buffer, unsigned int len) {
+        $1 = (uint16_t *) JCALL2(GetShortArrayElements, jenv, $input, NULL);
+        $2 = JCALL1(GetArrayLength, jenv, $input);
+}
+
+%typemap(freearg) (uint16_t *buffer, unsigned int len) {
+        JCALL3(ReleaseShortArrayElements, jenv, $input, (jshort *)$1, 0);
+}
+
+%typemap(jni) (unsigned int numberOfSamples, uint16_t *buffer) "jshortArray";
+%typemap(jtype) (unsigned int numberOfSamples, uint16_t *buffer) "short[]";
+%typemap(jstype) (unsigned int numberOfSamples, uint16_t *buffer) "short[]";
+
+%typemap(javain) (unsigned int numberOfSamples, uint16_t *buffer) "$javainput";
+
+%typemap(in) (unsigned int numberOfSamples, uint16_t *buffer) {
+        $2 = (uint16_t *) JCALL2(GetShortArrayElements, jenv, $input, NULL);
+        $1 = JCALL1(GetArrayLength, jenv, $input);
+}
+
+%typemap(freearg) (unsigned int numberOfSamples, uint16_t *buffer) {
+        JCALL3(ReleaseShortArrayElements, jenv, $input, (jshort *)$2, 0);
+}
+
+%include "gas.h"
+%include "mq2.h"
+%include "mq3.h"
+%include "mq5.h"
+%include "mq9.h"
+%include "tp401.h"
diff --git a/src/mic/javaupm_mic.i b/src/mic/javaupm_mic.i
index 1764429e..cdb0ce20 100644
--- a/src/mic/javaupm_mic.i
+++ b/src/mic/javaupm_mic.i
@@ -3,10 +3,38 @@
 %include "stdint.i"
 %include "arrays_java.i"
 
-%apply unsigned short[] {uint16_t *buffer}; 
-
 %{
     #include "mic.h"
 %}
 
+%typemap(jni) (uint16_t *buffer, unsigned int len) "jshortArray";
+%typemap(jtype) (uint16_t *buffer, unsigned int len) "short[]";
+%typemap(jstype) (uint16_t *buffer, unsigned int len) "short[]";
+
+%typemap(javain) (uint16_t *buffer, unsigned int len) "$javainput";
+
+%typemap(in) (uint16_t *buffer, unsigned int len) {
+        $1 = (uint16_t *) JCALL2(GetShortArrayElements, jenv, $input, NULL);
+        $2 = JCALL1(GetArrayLength, jenv, $input);
+}
+
+%typemap(freearg) (uint16_t *buffer, unsigned int len) {
+        JCALL3(ReleaseShortArrayElements, jenv, $input, (jshort *)$1, 0);
+}
+
+%typemap(jni) (unsigned int numberOfSamples, uint16_t *buffer) "jshortArray";
+%typemap(jtype) (unsigned int numberOfSamples, uint16_t *buffer) "short[]";
+%typemap(jstype) (unsigned int numberOfSamples, uint16_t *buffer) "short[]";
+
+%typemap(javain) (unsigned int numberOfSamples, uint16_t *buffer) "$javainput";
+
+%typemap(in) (unsigned int numberOfSamples, uint16_t *buffer) {
+        $2 = (uint16_t *) JCALL2(GetShortArrayElements, jenv, $input, NULL);
+        $1 = JCALL1(GetArrayLength, jenv, $input);
+}
+
+%typemap(freearg) (unsigned int numberOfSamples, uint16_t *buffer) {
+        JCALL3(ReleaseShortArrayElements, jenv, $input, (jshort *)$2, 0);
+}
+
 %include "mic.h"