aofs-06 #236 (aofs-06)