update for session issue @Author : Alex