aofs-08 #504 (aofs-08)