Automatic session change is now correctly handled