Fixed how client and server are called