cookie-free bugfix