diff --git a/src/qmckl_ao.org b/src/qmckl_ao.org
index 93d9b92..40e2823 100644
--- a/src/qmckl_ao.org
+++ b/src/qmckl_ao.org
@@ -325,11 +325,6 @@ integer function qmckl_ao_polynomial_vgl_f(context, X, R, lmax, n, L, ldl, VGL,
      return
   endif
 
-  if (n <= 0) then
-     info = QMCKL_INVALID_ARG_5
-     return
-  endif
-
   if (ldl < 3) then
      info = QMCKL_INVALID_ARG_7
      return
@@ -492,16 +487,11 @@ integer(c_int32_t) function test_qmckl_ao_polynomial_vgl(context) bind(C)
 
   allocate (L(ldl,d), VGL(ldv,d))
 
-  test_qmckl_ao_polynomial_vgl = &
-       qmckl_ao_polynomial_vgl(context, X, R, lmax, n, L, ldl, VGL, ldv)
-
-  if (test_qmckl_ao_polynomial_vgl /= QMCKL_INVALID_ARG_5) return
-
-  n=d
   test_qmckl_ao_polynomial_vgl = &
        qmckl_ao_polynomial_vgl(context, X, R, lmax, n, L, ldl, VGL, ldv)
 
   if (test_qmckl_ao_polynomial_vgl /= QMCKL_SUCCESS) return
+  if (n /= d) return
 
   do j=1,n
      test_qmckl_ao_polynomial_vgl = QMCKL_FAILURE