Latest CVS - tiny buglet...