aofs-06 #238 (aofs-06)