Semi-proper session fix