Fix a potential bug source with delegate calls