Index: libcfa/src/iostream.cfa
===================================================================
--- libcfa/src/iostream.cfa	(revision 37e56407a20d83aca273a870b3c3d7491ef1249e)
+++ libcfa/src/iostream.cfa	(revision 0a2e1c05231e823bd3713035bfed560cc3e83691)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Apr 25 09:54:49 2020
-// Update Count     : 962
+// Last Modified On : Sat Apr 25 17:24:26 2020
+// Update Count     : 974
 //
 
@@ -594,10 +594,9 @@
 				} else if ( f.base == 'o' ) { \
 					if ( fmt.flags.pc && fmt.pc > 22 ) fmt.pc -= 22; else { fmt.flags.pc = false; fmt.pc = 0; } \
+					fmt.val = (unsigned long long int)fmt.val >> 2; \
+					fmt2.val = ((msig & 0x3) << 1) + ((lsig & 0x8000000000000000U) != 0); \
 					if ( fmt.flags.left ) { \
 						fmt.flags.left = false; \
-						fmt.wd = 1; \
-						fmt.val = (unsigned long long int)fmt.val >> 2; \
-						fmt2.wd = 1; \
-						fmt2.val = ((msig & 0x3) << 1) + ((lsig & 0x8000000000000000U) != 0); \
+						fmt.wd = 0; \
 						if ( fmt2.val > 1 && fmt.flags.pc && fmt.pc > 0 ) fmt.pc -= 1; \
 						/* printf( "L %llo %llo %llo %llo %d %d '%c' %x\n", msig, lsig, fmt.val, fmt2.val, fmt.wd, fmt.pc, fmt.base, fmt.all ); */ \
@@ -607,22 +606,18 @@
 						int msigd = ceiling( high1( fmt.val ), 3 ) + 1; \
 						fmt2.wd = f.wd - (fmt.pc > msigd ? fmt.pc : msigd) - 1; \
-						/* printf( "\nL2 %llo %d %d '%c' %x\n", fmt2.val, fmt2.wd, fmt2.pc, fmt2.base, fmt2.all ); */	\
 						if ( fmt2.wd < 0 ) fmt2.wd = 21; \
-						fmt2.flags.pc = true; fmt2.pc = 21; \
-						if ( ! fmt.flags.nobsdp ) { if ( fmt.pc < fmt.wd ) fmt.wd -= 1; else fmt.pc -= 1; } \
-						fmt2.val = lsig & 0x7fffffffffffffffU; \
-						(ostype &)(os | fmt2); \
+						if ( ! fmt.flags.nobsdp && fmt.pc < fmt.wd ) fmt.wd -= 1; \
 					} else { \
-						fmt.val = (unsigned long long int)fmt.val >> 2; \
 						if ( fmt.wd > 21 ) fmt.wd -= 21; \
-						if ( ! fmt.flags.nobsdp ) { if ( fmt.pc < fmt.wd ) fmt.wd -= 1; else fmt.pc -= 1; } \
+						if ( ! fmt.flags.nobsdp && fmt.pc < fmt.wd ) fmt.wd -= 1; \
 						fmt2.wd = 1; \
-						fmt2.val = ((msig & 0x3) << 1) + ((lsig & 0x8000000000000000U) != 0); \
+						/* printf( "R %llo %llo %llo %llo %d %d '%c' %x\n", msig, lsig, fmt.val, fmt2.val, fmt.wd, fmt.pc, fmt.base, fmt.all ); */ \
 						(ostype &)(os | fmt | "" | fmt2); \
 						sepOff( os ); \
 						fmt2.wd = 21; \
-						fmt2.val = lsig & 0x7fffffffffffffffU; \
-						(ostype &)(os | fmt2); \
 					} /* if */ \
+					fmt2.val = lsig & 0x7fffffffffffffffU; \
+					/* printf( "\nC %llo %d %d '%c' %x\n", fmt2.val, fmt2.wd, fmt2.pc, fmt2.base, fmt2.all ); */ \
+					(ostype &)(os | fmt2); \
 				} else { \
 					if ( fmt.flags.pc && fmt.pc > 16 ) fmt.pc -= 16; \