Index: libcfa/src/iostream.cfa
===================================================================
--- libcfa/src/iostream.cfa	(revision c4e3c28b18503bcb89ebc7ad7c9fa7aa0f1c0d3a)
+++ libcfa/src/iostream.cfa	(revision 37e56407a20d83aca273a870b3c3d7491ef1249e)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Apr 24 13:51:36 2020
-// Update Count     : 956
+// Last Modified On : Sat Apr 25 09:54:49 2020
+// Update Count     : 962
 //
 
@@ -593,5 +593,5 @@
 					(ostype &)(os | fmt | "" | fmt2); \
 				} else if ( f.base == 'o' ) { \
-					if ( fmt.flags.pc && fmt.pc > 22 ) fmt.pc -= 22; else fmt.flags.pc = false; \
+					if ( fmt.flags.pc && fmt.pc > 22 ) fmt.pc -= 22; else { fmt.flags.pc = false; fmt.pc = 0; } \
 					if ( fmt.flags.left ) { \
 						fmt.flags.left = false; \
@@ -606,5 +606,6 @@
 						fmt2.flags.left = true;	\
 						int msigd = ceiling( high1( fmt.val ), 3 ) + 1; \
-						fmt2.wd = f.wd - (fmt.pc > msigd ? fmt.pc : msigd); \
+						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; \