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

Yep this is better, thanks.