Tweak to include slight delay and reraising