re #90 fixing states