aofs-07 #214 (aofs-07)