Previously did not handle 2D problems properly. Updated to handle this.
Authored by: cfoster 2004-09-10
Parent: [r920]
Child: [r922]