Better 2D case detection