Fix for stale clients