aofs-08 #331 (aofs-08)