aofs-07 #222 (aofs-07)