Attempt to fix session making