Fixed wrong location of target checks