@yuhunglin Also add the hasOwnProperty check here (we're using it in other places)