aofs-06 #232 (aofs-06)