Feature/fix session