Fix mismatched delegates