part of bug#2001, forgot to cvs add it