Potential fix for bug 573.

http://church.cims.nyu.edu/bugzilla3/show_bug.cgi?id=573