[PlayerJihadist] eradicated potential bug
Merge origin/master