Fixed helper proc not checking the targer.current

Indeed
Merge pull request #2872 from Razharas/RuntimeFix3

Fixed helper proc not checking the targer.current