Bugfix for anonymous mode