fix mixup
no need to build stuff from hand

xxx