fixed issue with wrong states