Fixed comm bug