I think you're right. It would be better to use ```has()``` rather than ```hasDefined()```. I'll update the PR's.