session timeout issues, try to fix it