Fix duplicate property and properly initialize return values
Only use base property when it is a valid name, fixes #44