correct resolving values based on containing block