aofs-08 #233 (aofs-08)