aofs-07 #132 (aofs-07)