aofs-09 #504 (aofs-09)