Final fix for abort issue.