aofs-07 #215 (aofs-07)