removed hasOwnProperty check