fixing hasOwnProperty lookups
more fixing of hasOwnProperty