fix for condition after the stay in client