Fixed bug with comms