fixed session-ing