Fixed sessions
Fixed more sessions