Fix challenger and challenged nesting