Fixed session logic