Fix session duplication

Even though I'm probably going to remove it