Fixing cookie behavior (3)