Fixed delegate handling