Fix abort logic -- from NH