aofs-07 #219 (aofs-07)