FIxes session logic

@evansb