Fixes #222
[FIX] A problem with self-target restrictions breaking commands under certain conditions (Thanks, iSnipeu).