Modify session logic just a tiny bit