Improve last change for easy-kill-thing-forward