Fixed delegate issue