Laziness fix in case analysis