Merge pull request #4405 from yizhang82/delegate_fix