Change to hasOwnProperty