For #489 fixing value for state