Fixed no_session stuff