aofs-08 #236 (aofs-08)