Fixed First Session Bug