even stricter pipe check