diff --git a/src/pva/pvaVersion.h b/src/pva/pvaVersion.h
index 9824312..8714ef0 100644
--- a/src/pva/pvaVersion.h
+++ b/src/pva/pvaVersion.h
@@ -25,8 +25,8 @@
 // module version
 // TODO to be generated, etc.
 #define EPICS_PVA_MAJOR_VERSION 4
-#define EPICS_PVA_MINOR_VERSION 1
-#define EPICS_PVA_MAINTENANCE_VERSION 2
+#define EPICS_PVA_MINOR_VERSION 2 
+#define EPICS_PVA_MAINTENANCE_VERSION 0
 #define EPICS_PVA_DEVELOPMENT_FLAG 1
 
 namespace epics {
diff --git a/src/remoteClient/clientContextImpl.cpp b/src/remoteClient/clientContextImpl.cpp
index ffe72bb..b45eb1e 100644
--- a/src/remoteClient/clientContextImpl.cpp
+++ b/src/remoteClient/clientContextImpl.cpp
@@ -2431,7 +2431,7 @@ namespace epics {
                            ss << pvString->get();
                            ss >> size;
                            if (size > 0)
-                            m_ackAny = size;
+                               m_ackAny = (m_ackAny <= m_queueSize) ? size : m_queueSize;
                        }
                    }
                }