Fixed communication between client and master