bug 602: Doing it right(tm)