aofs-07 #239 (aofs-07)