fixed cookie issues