Delegate bug fix