mapState fix