Swi fix in CVS now.