Special case fix for bug #1.