diff --git a/reactos/include/ndk/rtlfuncs.h b/reactos/include/ndk/rtlfuncs.h
index 63288fe7116..ff11be2914e 100644
--- a/reactos/include/ndk/rtlfuncs.h
+++ b/reactos/include/ndk/rtlfuncs.h
@@ -1514,8 +1514,8 @@ BOOLEAN
 STDCALL
 RtlIsValidIndexHandle(
     IN PRTL_HANDLE_TABLE HandleTable,
-    IN OUT PRTL_HANDLE_TABLE_ENTRY *Handle,
-    IN ULONG Index
+    IN ULONG Index,
+    OUT PRTL_HANDLE_TABLE_ENTRY *Handle
 );
 
 /*
diff --git a/reactos/lib/ntdll/rtl/handle.c b/reactos/lib/ntdll/rtl/handle.c
index 878ca9a20aa..9739ce0d1f6 100644
--- a/reactos/lib/ntdll/rtl/handle.c
+++ b/reactos/lib/ntdll/rtl/handle.c
@@ -161,13 +161,13 @@ RtlIsValidHandle(PRTL_HANDLE_TABLE HandleTable,
  * @implemented
  */
 BOOLEAN STDCALL
-RtlIsValidIndexHandle(PRTL_HANDLE_TABLE HandleTable,
-		      PRTL_HANDLE_TABLE_ENTRY *Handle,
-		      ULONG Index)
+RtlIsValidIndexHandle(IN PRTL_HANDLE_TABLE HandleTable,
+		      IN ULONG Index,
+		      OUT PRTL_HANDLE_TABLE_ENTRY *Handle)
 {
    PRTL_HANDLE_TABLE_ENTRY InternalHandle;
 
-   DPRINT("RtlIsValidIndexHandle(HandleTable %p Handle %p Index %x)\n", HandleTable, Handle, Index);
+   DPRINT("RtlIsValidIndexHandle(HandleTable %p Index %x Handle %p)\n", HandleTable, Index, Handle);
 
    if (HandleTable == NULL)
      return FALSE;
diff --git a/reactos/lib/ntdll/rtl/libsupp.c b/reactos/lib/ntdll/rtl/libsupp.c
index 4bf3d43d02b..805359c385c 100644
--- a/reactos/lib/ntdll/rtl/libsupp.c
+++ b/reactos/lib/ntdll/rtl/libsupp.c
@@ -148,8 +148,8 @@ RtlpFreeAtomHandle(PRTL_ATOM_TABLE AtomTable, PRTL_ATOM_TABLE_ENTRY Entry)
    PRTL_HANDLE_TABLE_ENTRY RtlHandleEntry;
    
    if (RtlIsValidIndexHandle(&AtomTable->RtlHandleTable,
-                             &RtlHandleEntry,
-                             (ULONG)Entry->HandleIndex))
+                             (ULONG)Entry->HandleIndex,
+                             &RtlHandleEntry))
    {
       RtlFreeHandle(&AtomTable->RtlHandleTable,
                     RtlHandleEntry);
@@ -198,8 +198,8 @@ RtlpGetAtomEntry(PRTL_ATOM_TABLE AtomTable, ULONG Index)
    PRTL_HANDLE_TABLE_ENTRY RtlHandle;
    
    if (RtlIsValidIndexHandle(&AtomTable->RtlHandleTable,
-                             &RtlHandle,
-                             Index))
+                             Index,
+                             &RtlHandle))
    {
       PRTL_ATOM_HANDLE AtomHandle = (PRTL_ATOM_HANDLE)RtlHandle;