cookie fix final