Improve Unicorn hit detection