fix one level deep delegates as well