Fix state
Fix the state name for real
Fix the topic index