Reroll breaks when tracked

Whenever you try to reroll a challenge while it's tracked it will use up rerolls but NOT actually reroll the challenge. 
As such you lose rerolls but the challenge stays the same. Only after untracking it works again but you lost the rerolls.

Expected behaviour: Auto untrack on reroll, reroll and then auto track again. (So it stays in the tracked tab of the player and doesn't disappear).