Delegates refactoring issue fix