Fixed typo, added namespace check for odd entries