Fixed name resolution from within inner blocks