Make sure internal stop and start are always paired with proper tags