Fixed delegate related bug same as d5daa05a453821dc022d17808500a795c8216a95
Fixed delegate related bug same as d5daa05a453821dc022d17808500a795c8216a95

This commit is not guarded by a test because I can’t think of a proper
way to test it.

Nandiin/Savory,Nandiin/Savory