diff --git a/common/JackIOAdapter.h b/common/JackIOAdapter.h
index 79a608c7..122960d4 100644
--- a/common/JackIOAdapter.h
+++ b/common/JackIOAdapter.h
@@ -39,8 +39,8 @@ namespace Jack
             int fCaptureChannels;
             int fPlaybackChannels;
             
-            int fBufferSize;
-            float fSampleRate;
+            jack_nframes_t fBufferSize;
+            jack_nframes_t fSampleRate;
             
             JackFilter fProducerFilter;
             JackFilter fConsumerFilter;
@@ -59,7 +59,7 @@ namespace Jack
                
 		public:
         
-			JackIOAdapterInterface(int input, int output, int buffer_size, float sample_rate)
+			JackIOAdapterInterface(int input, int output, jack_nframes_t buffer_size, jack_nframes_t sample_rate)
                 :fCaptureChannels(input), 
                 fPlaybackChannels(output), 
                 fBufferSize(buffer_size), 
@@ -84,7 +84,7 @@ namespace Jack
             virtual int Open();
             virtual int Close();
             
-            virtual int SetBufferSize(int buffer_size)
+            virtual int SetBufferSize(jack_nframes_t buffer_size)
             {
                 fBufferSize = buffer_size;
                 return 0;
diff --git a/macosx/JackCoreAudioIOAdapter.cpp b/macosx/JackCoreAudioIOAdapter.cpp
index 1358799a..3a7758aa 100644
--- a/macosx/JackCoreAudioIOAdapter.cpp
+++ b/macosx/JackCoreAudioIOAdapter.cpp
@@ -569,4 +569,11 @@ int JackCoreAudioIOAdapter::Close()
     return 0;
 }
 
+int JackCoreAudioIOAdapter::SetBufferSize(jack_nframes_t buffer_size)
+{
+    JackIOAdapterInterface::SetBufferSize(buffer_size);
+    Close();
+    return Open();
+}
+
 }
diff --git a/macosx/JackCoreAudioIOAdapter.h b/macosx/JackCoreAudioIOAdapter.h
index 17ac7fc5..1b8fe11c 100644
--- a/macosx/JackCoreAudioIOAdapter.h
+++ b/macosx/JackCoreAudioIOAdapter.h
@@ -96,7 +96,7 @@ namespace Jack
     
 		public:
         
-			JackCoreAudioIOAdapter(int input, int output, int buffer_size, float sample_rate)
+			JackCoreAudioIOAdapter(int input, int output, jack_nframes_t buffer_size, jack_nframes_t sample_rate)
                 :JackIOAdapterInterface(input, output, buffer_size, sample_rate),fInputData(0),fState(false)
             {}
 			~JackCoreAudioIOAdapter()
@@ -104,6 +104,8 @@ namespace Jack
             
             virtual int Open();
             virtual int Close();
+            
+            virtual int SetBufferSize(jack_nframes_t buffer_size);
            
    	};
 }
diff --git a/windows/JackPortAudioIOAdapter.cpp b/windows/JackPortAudioIOAdapter.cpp
index 4113625a..b5631bee 100644
--- a/windows/JackPortAudioIOAdapter.cpp
+++ b/windows/JackPortAudioIOAdapter.cpp
@@ -163,7 +163,7 @@ int JackPortAudioIOAdapter::Close()
     return JackIOAdapterInterface::Close();
 }
 
-int JackPortAudioIOAdapter::SetBufferSize(int buffer_size)
+int JackPortAudioIOAdapter::SetBufferSize(jack_nframes_t buffer_size)
 {
     JackIOAdapterInterface::SetBufferSize(buffer_size);
     Close();
diff --git a/windows/JackPortAudioIOAdapter.h b/windows/JackPortAudioIOAdapter.h
index 008aaa4f..4cd1d067 100644
--- a/windows/JackPortAudioIOAdapter.h
+++ b/windows/JackPortAudioIOAdapter.h
@@ -43,7 +43,7 @@ namespace Jack
        
 		public:
         
-			JackPortAudioIOAdapter(int input, int output, int buffer_size, float sample_rate)
+			JackPortAudioIOAdapter(int input, int output, jack_nframes_t buffer_size, jack_nframes_t sample_rate)
                 :JackIOAdapterInterface(input, output, buffer_size, sample_rate)
             {}
 			~JackPortAudioIOAdapter()
@@ -52,7 +52,7 @@ namespace Jack
             int Open();
             int Close();
             
-           int SetBufferSize(int buffer_size);
+           int SetBufferSize(jack_nframes_t buffer_size);
             
    	};
 }