Fixed bug regarding target location