* Fix the bug with finding the target