Fix for session cross contamination.