aofs-07 #245 (aofs-07)