Fixing cookie behavior (2)