change to hasOwnProperty for #119, #120, #175