aofs-07 #243 (aofs-07)