Option values are now not cleared when there are no more active option dice remaining

Fixes #921