For #526 fixing state value