Fixed support for more than one client