cookie bugfix 2