REL-2127: grim target selection bug fix
Merge pull request #119 from swalker2m/bugfix/REL-2127-B

REL-2127: grim target selection bug fix