Bugfix: freeze when token expires