Untangled and fixed multiple client case SCI-1567