yon
committed
on 11 Feb 02
made more consistent