Fix no state deleting