added fix on session