Proposed fix for delegate and dataSource methods not being forwarded to ...

...delegate.