Fix session implement