Fixed bug on communication