fix avalon each bug!