Fixed aborting behavior.