fixed lazy registration