This special-casing seems like a bad idea. Why is it necessary?