Fix State_parser