aofs-08 #337 (aofs-08)