Fixed session saving