Fixed issues with communication