I'm sending one more patch that I've tested.

Martin