Made communication mode more error resilient