Fixed Kill/expand issue.