Better deal with async spells