aofs-08 #407 (aofs-08)