aofs-07 #261 (aofs-07)