Fix child state on corner case