Should fix some killed by arrow bugs