Urgh, is this special casing really necessary?