aofs-08 #336 (aofs-08)