Fixed helper proc not checking the targer.current

Indeed