Fixup for 658a1019
Fixup for 76624a51
Add STATE_INVALID