Fix Session Handler