Fix for duplicate state issue.