Bug fix, wrong delegate