aofs-08 #423 (aofs-08)