Delegate conflict fixed