aofs-07 #230 (aofs-07)