Workaround for state codes
revisions