I've tested this patch and it is now in CVS