Add hack for cookie-persistence