stupid nesting issue fixed