fix avalon BUG