Delegate Fix

Delegate Bug Fix