Fix delegate detection
0.6.1