This fixes an issue where state bleed from the parent to the child

I need to double check, but i believe so.