Addressing issue with client/server communication