Fix
Improve delegation