Nicer fix for 2D-labelled-3D checking from master.