aofs-08 #227 (aofs-08)