Cookie workaround bugfix