fix up two-up buttons (bug 887457)