Communicator bug fix