Session Bug Fix