AND case was uncommented back in