remove hasOwnProperty check