paiment delegate fix
avalon WIP