Fixed Delegate Issue