aofs-04 #217 (aofs-04)