The previous patch was probably too drastic.  Let's try
the attached one.

martin