Final fix for --nostager --expect