And finally restoring the right logic when the opened token has been updated.
I should get some rest