diff --git a/rtl/i386/rttip.inc b/rtl/i386/rttip.inc
index b6545757d6..33663bf046 100644
--- a/rtl/i386/rttip.inc
+++ b/rtl/i386/rttip.inc
@@ -30,11 +30,11 @@ asm
         jz      .LDoAnsiStringInit
         decb    %al
         jz      .LDoAnsiStringInit
-        subb    $3,%al
+        subb    $2,%al
         jz      .LDoArrayInit
         decb    %al
         jz      .LDoRecordInit
-        decb    %al
+        subb    $2,%al
         jz      .LDoClassInit
         decb    %al
         jz      .LDoObjectInit
@@ -122,11 +122,11 @@ asm
         jz      .LDoAnsiStringFinal
         decb    %al
         jz      .LDoAnsiStringFinal
-        subb    $3,%al
+        subb    $2,%al
         jz      .LDoArrayFinal
         decb    %al
         jz      .LDoRecordFinal
-        decb    %al
+        subb    $2,%al
         jz      .LDoClassFinal
         decb    %al
         jz      .LDoObjectFinal
@@ -219,7 +219,7 @@ asm
         jz      .LDoArrayAddRef
         decb    %al
         jz      .LDoRecordAddRef
-        decb    %al
+        subb    $2,%al
         jz      .LDoClassAddRef
         decb    %al
         jz      .LDoObjectAddRef
@@ -305,7 +305,7 @@ asm
         jz      .LDoArrayDecRef
         decb    %al
         jz      .LDoRecordDecRef
-        decb    %al
+        subb    $2,%al
         jz      .LDoClassDecRef
         decb    %al
         jz      .LDoObjectDecRef
@@ -375,7 +375,11 @@ end;
 
 {
   $Log$
-  Revision 1.20  2000-02-09 16:59:29  peter
+  Revision 1.21  2000-02-18 15:23:01  florian
+    * fixed constants in rtti
+    * longjmp does now a finit
+
+  Revision 1.20  2000/02/09 16:59:29  peter
     * truncated log
 
   Revision 1.19  2000/01/11 21:11:34  marco
diff --git a/rtl/i386/setjump.inc b/rtl/i386/setjump.inc
index 7ebf54d1ee..c6107c0565 100644
--- a/rtl/i386/setjump.inc
+++ b/rtl/i386/setjump.inc
@@ -38,6 +38,7 @@ asm
   jne .Ljnonzero
   movl $1,%eax
 .Ljnonzero:
+  fninit
   movl (%ecx),%ebx
   movl 4(%ecx),%esi
   movl 8(%ecx),%edi
@@ -50,7 +51,11 @@ end;
 
 {
   $Log$
-  Revision 1.9  2000-02-09 22:12:54  florian
+  Revision 1.10  2000-02-18 15:23:01  florian
+    * fixed constants in rtti
+    * longjmp does now a finit
+
+  Revision 1.9  2000/02/09 22:12:54  florian
     * longjump does now a finit
 
   Revision 1.8  2000/02/09 16:59:29  peter