delay data handling, fix abort condition