cookie bugfix 3