Corrected the ugly hack.  Still ugly, but now it works.