aofs-07 #199 (aofs-07)