Correct support for multiply clients