fix NP issue for session