Session expiry fix