Bugfix for token management during observations