Another stab at bug #680