Fix delegate resolution