Fix multi-client flow