Better fix regarding to state.