Got rid of faulty sessions handling