fix state mappings