Fix weird nesting issue