Parsers - State_history bugfixes