Fixed Kill Bug