aofs-07 #241 (aofs-07)