Dan's bug #92