Now handles unnamed 0 and 1