delegate fix