aofs-06 #237 (aofs-06)