Attempt to resolve duplicate state issue from #11