Fix issue with client/server communication