Fixed problems with communication