Fix delegate calling