Session variable problem fixed

Please merge