Fix for simple delegator.