No need for any of this special casing