Fix delegates bug