Fixes delegate related bug