Fix delegation logic