Commentary bugs