aofs-07 #227 (aofs-07)