Fixed communication issue