The attached patch fixes my issue, but am not sure if it is correct or
will  cause problems else where.