Still some issues, but it's not hosing up the ancestor chain now