Fixed defaulting of use of state similarity so it is self-consistent!