aofs-07 #253 (aofs-07)