Fix session overriding