Resolving stale connection issue