SessionMap fix