Working on session bug