FIX: changes a delegation to fix issue 11