Fix Invalid States problem.