Fixed issue 29
Updated the delegate to fix the issue