Fixed the cookie issue