fixing preorder data capture bugs