Fixed delegate search